auto merge of #516 : alexcrichton/cargo/issue-512, r=brson
authorbors <bors@rust-lang.org>
Mon, 8 Sep 2014 18:43:54 +0000 (18:43 +0000)
committerbors <bors@rust-lang.org>
Mon, 8 Sep 2014 18:43:54 +0000 (18:43 +0000)
Closes #512


Trivial merge